<!DOCTYPE html>
<html lang="en">
<head>
	<meta charset="UTF-8">
	<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
	<title>穷游</title>
	<link rel="stylesheet" type="text/css" href="dist/css/reset.css"/>
	<link rel="stylesheet" type="text/css" href="dist/css/bootstrap.css"/>
	<link rel="stylesheet" type="text/css" href="dist/css/main.css"/>
	<link rel="stylesheet" type="text/css" href="dist/css/swiper-3.3.1.min.css"/>
	<link rel="stylesheet" href="dist/css/BBS.css" />
<<<<<<< HEAD

	<link rel="stylesheet" href="dist/css/BBS.css" />

	<script src="js/jquery-2.1.1.js" type="text/javascript" charset="utf-8"></script>

	

	<script type="text/javascript" src="js/jquery-2.1.1.js"></script>

=======
	<script src="js/jquery-2.1.1.js" type="text/javascript" charset="utf-8"></script>
>>>>>>> 9926f25e42e7b76e3063bfa9d4d87e46e2d27463
	<script type="text/javascript" src="js/angular.js"></script>
	<script type="text/javascript" src="js/angular-route.js" ></script>
	<script src="js/angular-animate.js" type="text/javascript" charset="utf-8"></script>
</head>
<body ng-app="myapp" ng-controller="con">
	<div ng-view></div>
	<ul id="tab">
		<li>
			<a href="#/">
				<span class="glyphicon glyphicon-home" aria-hidden='true'></span>
				<p>首页</p>
			</a>
		</li>
		<li>
			<a href="#/bourn">
				<span class="glyphicon glyphicon-map-marker" aria-hidden='true'></span>
				<p>目的地</p>
			</a>
		</li>
		<li>
			<a href="#/store">
				<span class="glyphicon glyphicon-shopping-cart" aria-hidden='true'></span>
				<p>商城</p>
			</a>
		</li>
		<li>
			<a href="#/BBS">
				<span class="glyphicon glyphicon-globe" aria-hidden='true'></span>
				<p>社区</p>
			</a>
		</li>
		<li>
			<a href="#/mine">
				<span class="glyphicon glyphicon-user" aria-hidden='true'></span>
				<p>我的</p>
			</a>
		</li>
	</ul>
		<!--登陆页面-->
	   	<div ng-if="bool" id="login">
	   		<h3><span class="glyphicon glyphicon-arrow-left" ng-click="loghide()"></span> 账号密码<button ng-click="enrollpage()">注册</button></h3>
	   		<div id="loginform">
	   			<h6>登录</h6>
	   			<input type="text" name="username" ng-model="username" placeholder="输入邮箱/用户名"/>
	   			<input type="password" name="password" ng-model="password" placeholder="输入密码"/>
	   			<a href="" style="text-decoration:underline">忘记密码？</a>
	   			<button ng-click= "login(username,password)" id="loginbtn">登录</button>
	   			<a href="">手机号登录</a>
	   		</div>
	   	</div>
   		<!--注册页面-->
	   	<div ng-if="enroll" id="enroll">
	   		<h3><span class="glyphicon glyphicon-arrow-left" ng-click="enrohide()"></span> 手机号注册</h3>
	   		<div id="enrollform">
	   			<div>
	   				<span>+86</span>
	   				<input type="text" placeholder="请填写你的手机号" ng-model="tel"/>
	   			</div>
	   			<div>
	   				<input type="text" placeholder="输入验证码" ng-model="verifynum"/>
	   				<button ng-click="logmsgpage(tel)">发送验证码</button>
	   			</div>
	   			<button id="enrollbtn" ng-click="verify(verifynum)">下一步</button>
	   		</div>
	   	</div>
   		<!--提交信息页面-->
	   	<div ng-if="logmsg" id="log_msg">
	   		<h3><span class="glyphicon glyphicon-arrow-left" ng-click="logmhide()"></span> 手机号注册</h3>
	   		<div id="log_msgform">
	   			<h6>手机号注册</h6>
	   			<input type="text" name="name" ng-model="newname" placeholder="请输入用户名"/>
	   			<div>
	   				<input type="password" name="password" ng-model="newpass" placeholder="密码（至少8位，同时包含字母数字）" id="new"/>
	   				<input type="text" placeholder="邀请码"/>
	   			</div>
	   			<p><input type="checkbox" id="" ng-click="passhow"/>显示密码</p>
	   			<button id="log_msgbtn" ng-click="zc(newname,newpass,tel)">完成</button>
	   		</div>
	   	</div>
</body>
<script type="text/javascript" src="js/swiper-3.3.1.min.js"></script>
<script type="text/javascript" src="js/app.js"></script>
<script type="text/javascript" src="js/home.js"></script>
<script type="text/javascript" src="js/boyrn.js"></script>
<script type="text/javascript" src="js/mine.js"></script>
<script src="js/store.js" type="text/javascript"></script>
<script src="js/BBS.js" type="text/javascript" charset="utf-8"></script>
</html>